Merge branch 'places-sidebar'
authorFederico Mena Quintero <federico@gnome.org>
Sun, 21 Apr 2013 19:51:49 +0000 (15:51 -0400)
committerFederico Mena Quintero <federico@gnome.org>
Sun, 21 Apr 2013 19:51:49 +0000 (15:51 -0400)

Trivial merge